Merge changes Ie28e6c80,I3cb9b2ce
am: 90d5e7b190

Change-Id: I7e910aaed571c3c37fd4a5ba4d5a0eeb5f52c8bd