Merge QPR1.180718.001

Change-Id: I4fcbf3db638c80dc12294a42b0696a3402c3439e