Merge QPR1.180718.001

Change-Id: I4e8bf6a943ccba023b8731434933ae7c41559c47