Merge changes Ib81bd82d,I9a57fca0
am: 247f318951

Change-Id: Ida1e741039ffcf58d15c9745eefa1f86ec378eb7