Merge changes Icad6d952,Ic41aa804 am: ed0180ce35
am: 6215c68322

Change-Id: I52e4a3f932cc175f8ea477e8e9c9a63c4a4ab4d9