[automerger skipped] Mark ab/7061308 as merged in stage. am: 3e770d2e94 -s ours am: 03e3255e7e -s ours

am skip reason: Change-Id I82bb2e4669f62e3b1ba6e468f753b3009468574a with SHA-1 5c44010b70 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23558db6742385d8bc9b6327f88f34dea74e85f8