Merge "API Review: Rename getStandbyBucket to getAppStandbyBucket" into pi-dev