merge latest and my changes

Change-Id: I9f8a2ead38ec07e4ee3014f5f00ac58a7cd5ad3e