DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev

Change-Id: Ie52a9abae416bbb84ddc61bb7159a531de778c15
1 file changed