merge latest and my changes

Change-Id: I604c5b1c1fbd0aa5f9f879b7369ba7ee749934ea