Merge changes Ifc818a69,I433b33d0
am: be20684665

Change-Id: Ia0317936d62a1ec11e2bd6e4fd67ad3bc55de6d9