merge latest and my changes

Change-Id: Iafda003757d2150b57d6271e185105ee417773ad