Follow our own msm9860_jbbl

Change-Id: I5a2472a53db23d65fc86f722df78f43858a58666
Merge "Follow our own msm9860_jbbl" into kk44