Merge QPR1.180718.001

Change-Id: Ibdfef19dea3302cc5d2fe19f78133ff6276c026f