Merge changes Ia7c70965,I881a3f8d into msm-4.9

* changes:
  Merge android-4.9.103 (70c65e4) into msm-4.9
  Merge android-4.9.102 (9c3041c) into msm-4.9