Merge "resolve merge conflicts of 270947f7 to klp-modular-dev am: 76c4b2a7 ...

Merge "resolve merge conflicts of 270947f7 to klp-modular-dev am: 76c4b2a7  -s ours am: bbbb514b am: 6a502709 am: a0994c6d am: cdf70ba0 am: c2a760e6 am: 77dec89b am: 203d1bee am: 7a46fac0 am: d5756586 am: c18b88c1 am: 1c153c69 am: 20e7a6b4" into nyc-mr1-dev-plus-aosp
am: cdaa07ed

Change-Id: I4739d530849929d606e102df74d34996e5018190