Merge changes Ie756b9aa,I38110f3a
am: 87bf9bc09c

Change-Id: I69e6c9234f0a983a56ee19d4d4dfe97618dc8f56