Merge changes Ie7318b61,Ie0d350f2 am: c85814676d
am: 4988d05f98

Change-Id: I1587345af1b49850db63a45787b668bdc9bed395