Mark ab/7061308 as merged in stage. Bug: 180401296 Merged-In: I7f701c7f4ca6b20d3fe9abebb7220eaabfcd0e6f Change-Id: Ia6cd48a76ff8f14758d4808da126d36160c2f115