Merge changes Ie795897d,I86e1cfed,I840ecbca am: 1636f41a45 am: c77adfad4d
am: e31c1e0aac

Change-Id: I0a01a5f9662843822823708783645256ac4e0042