Merge changes Ic4fcbb22,I1be8a18d
am: b19f11d09d

Change-Id: I666a015519db1221eaa6f2523b8a11653e5991f2