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

Merge "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" into nyc-dev am: fea9feb3 am: fb3c06f8" into nyc-mr1-dev-plus-aosp
am: 73046678

Change-Id: Icd8ecd994da082b6bb63aed5eed0963386174df3