Merge \"Fix to get to Home after powerbutton test am: 8c755078 am: b528bba0\" into nyc-mr1-dev-plus-aosp am: 8be08b06 Change-Id: Ife55204ead67b65e57078be41bc01b53dce5d44b