[automerger skipped] Mark ab/7061308 as merged in stage. am: b054ccfb12 -s ours am: 8ff5a45afa -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: I6961f3628194fc8b94da8cb2e8b6b0eee2953d0f