Merge changes Ie795897d,I86e1cfed,I840ecbca
am: 1636f41a45

Change-Id: I60db4b527a4625758c242f4c81e02039a3cee62b