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

Change-Id: I837fccb33f15b3f136f9e69a745142ae2ff86a1a