Merge changes Ie816e0c6,I5b94e92a,I5391ac49,If074bed1 am: e88817bd42 am: cd54c586bb am: 88c4abb4ee

Change-Id: I8a895f7b3b56a93288e88448e58ac6866824ef58