[automerger skipped] Mark ab/7061308 as merged in stage. am: bc88a92971 -s ours am: 1dd7f70ef5 -s ours

am skip reason: Change-Id I6474d863ec9d6cb1630c529687be4465f1f8f295 with SHA-1 08133d2cb6 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bf4bfcc72210f751ae5f9123d759738f1201e97