Sync changes

Change-Id: I9f5ac0854bbbc79a777bf38ee482683e3f781a13