Merge "Manual update from a bugbot hidden API comment." into pi-dev
am: cc2cbe8dc8

Change-Id: Ic4fde8029719856ca964707104a296a91e41de0d