Merge changes Icdaf1cf1,I80ba5adb,I8de912c1
am: 0db49f9f7c

Change-Id: I6f7c084b4bb057d9ec600a7cae69b66638926151