Merge changes Idcdfe515,I888be2bd
am: bb31f51f8b

Change-Id: I69ddd3804002fe07c80a89fdbf321aac8556eb6a