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

Change-Id: I370ef7e44b7bf2cb4e871e64642c900c0a3da66c