DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours
am: bb12830bf9
Change-Id: I51e797becf12a2c21e04eb5e701b44cad5f8045f
This commit is contained in: