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

am skip reason: Change-Id Ica5b998f99005ac80313f66a2781525398c26de9 with SHA-1 062badd57a is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7501fbc4e034f93d43a09829fb51eb31a47aa407