Merge commit '9068183dd23fb09c1837b58c9afd210cea635291' of sso://googleplex-android/device/generic/common into HEAD
Change-Id: I6e75d8345a0c7ebd275bf2167491ea7ff18897b1