Merge QP1A.190324.001

Change-Id: I5bb76670de6ae998095468ffeffc646c256129b8