Merge changes Ib8e1b852,I7e848e97,I7d620721 am: 66098afb42 am: dcfedabfad
am: 8b6c28245f

Change-Id: Ie8f781f119f232df84576276d41c311057fde1a0