Merge branch 'm4-jb' into android-msm-3.0-jb

Change-Id: Ia49cc9bb363e5c4a032f989e2e443a2dcb1c5715