[automerger skipped] Mark ab/7061308 as merged in stage. am: 706a6ab36d -s ours am: fb880b4133 -s ours

am skip reason: Change-Id I6b99e5e590504bda7f681ae6cdd7557f74402378 with SHA-1 afd797f823 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If81c8ccdc5de1a5e4a8856421d31eabbedb11a14