Merge QP1A.190324.001

Change-Id: I9e97122d3d382f457c458d47bd062a16c9c3d6f9