Merge changes Ic9258141,If4b32546 am: 643af28f1d
am: 700840cf42

Change-Id: I9dbcd9e7df0895d442f498737faf6ee5154b9067