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

Change-Id: I1ee38db584ab0c03cae2f7bb06d9f1518f102403