Merge changes Ic5340e95,I94f54ffe,I3bc947a2 am: 07091dc905 am: 7d66a2787f
am: 046fbcda92

Change-Id: I45614ee54a3a84eaefbd008dc5ddc0d1afc5a62e