Merge QP1A.190324.001

Change-Id: Ie9b21a4375bc5c67d3bdcc5eab095c47dd6c58a2