Merge QPR1.180718.001

Change-Id: I9f1d959f180571cb9c19f209b5c887418478b4ed