[automerger skipped] Mark ab/7061308 as merged in stage. am: 2dcabc8c56 -s ours am: 134e1e6324 -s ours

am skip reason: Change-Id I9125ad289c9480e7306a071908259e5258843094 with SHA-1 52e4c6e58e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a9f953e2509a7ad89a5b80acf138ba312e84806