Merge QP1A.190122.001

Change-Id: I8f8d2d83f79067019ed3512823d78a657525f7a6