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

Change-Id: Ifb257e127e028c2edfaf16ed2785cb92e60e7705