resolved conflicts for merge of 253009ac to klp-modular-dev-plus-aosp

Change-Id: I0d56e3d9e899c542ef0ed8d1c2e12004e24d7044