Merge changes Icad6d952,Ic41aa804
am: ed0180ce35

Change-Id: Ibd0bb10e47b99661ff5963f3827f9d1305c4c07e