Merge QPR1.180718.001

Change-Id: Ib85adb81dbf596016e12fc5b56e6a584ff7a57b0