Merge QP1A.190324.001

Change-Id: Ife6654b046b411484f465d578ca17fc08a5896b6