Merge changes Ia4bec085,I59095f2a
am: 733d007279

Change-Id: Id0f0746af66b4f2e0352e2a0dde9d3f27e23f84c