Merge QP1A.190411.001

Change-Id: I26c30b1aceed00ec62a42682b7d4360e87a3a802