Merge branch into kk_mkt
p880: mokee bringup

Change-Id: I1ac56415921593c37fae1638474aa968cb189595