[automerger skipped] Mark ab/7061308 as merged in stage. am: 2eb284d7db -s ours am: 114cfcca1b -s ours am: 2d504b3220 -s ours

am skip reason: Change-Id I9487784e642a7060afa4f72605428b1ce7638ba8 with SHA-1 306a3978ca is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45e743836b4f459b832b3e6cc95b8364f6bd723e