Merge QP1A.190122.001

Change-Id: Ibe91b6dc47ed0d015703d886a784475a997163f1