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

am skip reason: Change-Id Ibee0088b6c9ea0129d313fcf4a857949f376686b with SHA-1 8d99fea137 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e6782c019c858931c3e400205158e5bfaaa73b8