Merge QP1A.190122.001

Change-Id: I75ab7f5393de7bf69f300b4872082d9bb1cefe2d