Merge commit '0d8073f06e12edda5deb7e41684123810b1ea6db' of sso://googleplex-android/platform/external/piex into HEAD
Change-Id: I6101102646a411f93243eb9ae01f1acc523f166c