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

Change-Id: I4e528494f10f9d7a332cbd52cfb5de1104c37a01