merge latest and my changes

Change-Id: I2f87dbe3e2fa8f80ca87232e060cb4be2d836d01