Merge changes Ib69a206f,If57cc175
am: 56e89ade33

Change-Id: Id6d1428be5519ab3ad4694cc4dea9ea96ff62d2e