Merge "Hidden API bugbot update" into pi-dev am: b50d9f8123
am: 3428cbf8fe

Change-Id: If08dddb2f06eb6f61d05a2e6a8a564c272fa5b3c