Merge QP1A.190523.001

Change-Id: I2ad95066e7312841086044f97aa97efd5d9e2703