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" into nyc-dev am: fea9feb3 am: c3a6dbd4 am: 5d146ccd am: 1167bcf2
am: 17636dac

Change-Id: Idde167a3ce569954472fc8ebd03ad6a15088e634