Merge "Get application info in the correct user id" into pi-dev
am: df75309281

Change-Id: I763a8fae339cb9ca56b713c695d3e97e3c46c3d5