[automerger skipped] Mark ab/7061308 as merged in stage. am: 37078ff510 -s ours am: 56e9e6f602 -s ours

am skip reason: Change-Id I7a7d0a98c4afc0964d0f6d2324c5b04d26ce466e with SHA-1 416e81f33e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ff7ffd711d751ee1f2878c9058b4a4cd1dba92a