[automerger skipped] Mark ab/7061308 as merged in stage. am: cd5a15eac8 -s ours am: ae449e69a0 -s ours

am skip reason: Change-Id I83b71dcf79b08458d20fa6057895aab8d897f22b with SHA-1 6ca879fcf4 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d9025aad8b920b5be2ce8b384fee26339e4850e