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

Change-Id: Ifead62cf031d59f37775b8f2000af0fac8301734