Merge changes Icce2f6ed,Ic1788f65,I59e327d4 am: cb2c0230a1 am: ce7c349bc6

Change-Id: I966451c907e9ae71da72a7bcbefe3bb53f1ec08d