[automerger skipped] Mark ab/7061308 as merged in stage. am: 2e378e76d0 -s ours am: fed32d7439 -s ours am skip reason: Change-Id Id1fcb9b1808a1c769addd79dc1ba972d67407ec1 with SHA-1 fed02fe9c8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I246b724ade3ffef99dbe3878730418cd9a24ba9b