Merge QPR1.180718.001

Change-Id: I57540910ac207ed675c21dbfd3c9a24b4c9fc4fa