Merge QP1A.190324.001

Change-Id: I14c307d3614be262e781ddb02e4aed0580b845c8