Merge "Go home before starting AwareActivity." into pi-dev
am: 953e18bd9f

Change-Id: I69c50731d0590961c35bcb1da09ee47af08aaee4