Merge QP1A.190324.001

Change-Id: Ib06f5e15cc87549a9d2ba77dce17f5363996644d