Merge "Merge "Create standby bucket changed atom." into rvc-dev am: 169a2977 am: a60761c9" into rvc-d1-dev-plus-aosp