merge latest and my changes

Change-Id: I578ae35e533dd9de3ee726e6a0f1deb410248dc9