resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp.

Change-Id: Ia05aa968e5f350c2768fc81491050001fcc94a5d