Merge changes Ie816e0c6,I5b94e92a,I5391ac49,If074bed1
am: e88817bd42

Change-Id: I196aa9a0563091bb350f75b2145eb049fd46b98b