Merge changes Iaf172f37,I15a8ade7,Icbc6b62b am: a326807d1a
am: 79eb707eab

Change-Id: I891f4c5c4c6ab213a0e3d86eb705abf7aa073b57