Merge QPR1.180718.001

Change-Id: Ie4b848ff3f27ad24913919bd336983d8ce234c18