Merge commit '551bea825b9c6f114f57f8cd0b607e3083de9c49' of sso://googleplex-android/device/common into HEAD
Change-Id: Ida050f6e6854d9ec7fad89ba66796046b2ec9a9a