Merge changes from topic "change-shared-user-apk-cert-pi-dev" into pi-dev
am: 1b93e623be

Change-Id: Ic54d1be1284eb0802aab04b99d835085200fe81b