[automerger skipped] Mark ab/7061308 as merged in stage. am: 0c9a7999da -s ours am: b42c50da3b -s ours

am skip reason: Change-Id Id3ed2df596fa6bbca5fac0dc2dc78c9f4d530c81 with SHA-1 fe45956b22 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68bbbbb7cd0a18258484930a68bc36036e4245db