Merge changes I1944666e,I30c789e0 into msm-4.9

* changes:
  Merge android-4.9.116 (52be322) into msm-4.9
  Merge android-4.9.115 (e6f9a8a) into msm-4.9