Merge from 7.1 to 7.2

Change-Id: I3db340a7c971be6abf18514f044114802edfc4de