Merge changes Ie36c8935,If96a44ce am: e3fda9ecc6 am: fc9b1b9f11
am: 7c8f0e3c63

Change-Id: Ib9efe9e31c7b461a822a58ab25f50c2043d6e121