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

Change-Id: I52ab8c3e6ff15919007a539dfed42498ac78cae0