Merge changes Ic190bd8c,I865044c8
am: 5d0f40f7c5

Change-Id: Ibe4ce9712a788e4160d3ae24b18652c3684f90d7