Merge QPR1.180718.001

Change-Id: Ie5a58782f5f5b162470043cea97df0d03f308632