Merge "API Review: Rename getStandbyBucket to getAppStandbyBucket" into pi-dev am: 555767b616
am: 5cca011bd1

Change-Id: I9f94bbb867d3d55e3f03f6af4e89bb00216e4b97