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

am skip reason: Change-Id I7e68f0a1a3e43552d24876b50b7447e14517c85f with SHA-1 a1abdf3186 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfdb54ee8c73652f6238bc40bac9f52e66ccd934