[automerger skipped] Merge changes from topic "store-interface-stability-aosp" am: 9759952af5 -s ours am: 97a1925605 -s ours am: b3b5760280 -s ours
am: b63896a66d -s ours
am skip reason: change_id Ifd9aa07ae359557ff94b600c1b64bb565be85dc2 with SHA1 7b10226a88 is in history

Change-Id: I25c3e0fdf97afd675a1f4cfe07d4950adb6e20a6