[automerger skipped] Mark ab/7061308 as merged in stage. am: d0e4fb871e -s ours am: 3721ab3b61 -s ours

am skip reason: Change-Id Ifa43d0c5a5292153ce3fce4c6e8cbeb07d5a3ea6 with SHA-1 7fa5936dbc is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7510e1c21b6d84c5ddc8ecf1b455051f39c03dc2