Merge QP1A.190212.003

Change-Id: I80b0e9895419db9e20aa75db5e50b690f2d7f6cc