Merge changes Ic5340e95,I94f54ffe,I3bc947a2
am: 07091dc905

Change-Id: I37612eff52d584c7e77bbe77c8efb8528a140c94