Merge "Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev am: 54c3213304" into nyc-mr1-dev-plus-aosp