[automerger skipped] Mark ab/7061308 as merged in stage. am: 3672eecc79 -s ours am: 96ede1cbc4 -s ours

am skip reason: Change-Id If9d47943a9386f3d2e4df9e239442c463446f0fc with SHA-1 b958d72d38 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2271c0ccf81f7520c8ff2fef199cda49e922d0e7