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

am skip reason: Change-Id I9ab9b7ef95a8127c8c70411a053f6005a5ccd867 with SHA-1 5e3873983e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8eb446e4bc98526a16f614dedf173184bdd0d947