Merge changes Ic2d48c93,I981ac9bd
am: cfede4fdd1

Change-Id: I31ce22086b74177e55da6452795f1fa3ce0ceaf9