[automerger skipped] Mark ab/7061308 as merged in stage. am: 8a4c87a309 -s ours am: c00ff406b4 -s ours

am skip reason: Change-Id Ie73488f7da50d4301d4718f57891b6fc3590d28c with SHA-1 b8d30fba19 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If96421533e59798a8d1af9fce984b53732365b22