Merge QP1A.190408.001

Change-Id: I07526cad6834917afa58d5e73cd42b520abf3db5