[automerger skipped] Mark ab/7061308 as merged in stage. am: aefc11c68a -s ours am: 39bbd46163 -s ours

am skip reason: Change-Id I3eae4b0263d3ebfa1cce6a397821b7051612d0a5 with SHA-1 b44137722a is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fba9b6a83fcba7a18a8c48ecfe17d97d3dfc3a7