Merge QPR1.180718.001

Change-Id: If78666dbff6d15a47046b3bad01783ff8f5c9608