Merge changes Idafeb835,Ie1a9bf85 am: 69eb60be5d
am: d5608eaad8

Change-Id: I5e6e2cb3255cf3c5dc6f1145ddeafd0e78de4160