Automatic translation import 

Change-Id: Ibaae531a8d2cc4f845e85a26b919ad782d348b8b
fmapp2: Fix the build

Change-Id: I5c079906508ecbf17c886e196fa2df8d4e28db7d
Merge branch 'cm-11.0' into kk_mkt