merge latest and my changes

Change-Id: Iff5ae6b55e48e0d79a5caba054e57b606c83b68f