Merge QP1A.190122.001

Change-Id: I5368b68880c0a00e733ad2b16b5f2343fb10458a