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
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
Change-Id: I87ffde2e35401e7d027ddae59bbbeddbe6ed91dc
This commit is contained in: