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

am skip reason: Change-Id I17c7ab362c610a1afb5b6ff211ca824fea4ace1d with SHA-1 35d892490b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2a159a9412578c7c748f6201ca126d91bba8026