Merge changes Ibd3ef6e3,I6e9944a2 am: e6a269f6d3
am: 39b45e1624

Change-Id: I9518969c9a35f064b6b7941d59ef902d8dae2bb0