Merge changes Ic3c5095c,I87bc3e37,Ifd21e25b
am: ca10a6ffd3

Change-Id: I57dcfebcbbe0104b234afd0cdcfa0c382ac3216e