Merge changes Ia1765cb4,Ib262ca4b
am: 5114e1dc7d

Change-Id: Iec567d1ad164e1f2a7ca96fe82c19dfbda1e46d9