Merge QP1A.190122.001

Change-Id: Ibce00631f6ecef0415ecbdbaa6dc6bab420d7667