[automerger skipped] Mark ab/7061308 as merged in stage. am: e3189183d0 -s ours am: 22419f2690 -s ours

am skip reason: Change-Id I779e25cdf564db6e813adee4a328f545214d95d6 with SHA-1 635f6bb290 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b61bd07c49216e1924c575db6ae5b94ad2fd079