Merge QP1A.190324.001

Change-Id: I2739298b541c4cebf846c720589c4531b78f4524