Merge from 7.2

Change-Id: Ic52a0be061bf22058ac9b831f3e965547a1b8933