Merge QPR1.180718.001

Change-Id: I978fed352c42a28531a8d22609808dbededcfcbf