Merge branch into kk_mkt
mokee bringup

Change-Id: I33d8169471b95e08f2ab7bdec3eca6fb005070de