Merge commit '638bf4c2020c0f4f17563d834644699d1a328838' of sso://googleplex-android/platform/external/replicaisland into HEAD
Change-Id: I97b789d1741b66f1dd5d88b41f63c1658d80668a