Merge QPR1.180718.001

Change-Id: I4a4b12bae1eccc69107ad7d808c7f554322f09de