Merge changes Ie28e6c80,I3cb9b2ce am: 90d5e7b190
am: adb4a02ecd

Change-Id: I550b2dd325dba38513eabb3ae8c94c2787fbbf70