Merge QPR1.180718.001

Change-Id: If4c386b65cff5bef09b1746e03b5f4c986c4e1db