Merge QPR1.180718.001

Change-Id: I3679deb47a541eb3ba03874bd00e7274806b0c4c