Merge QP1A.190122.001

Change-Id: I317e058d1676c638b980d458ed9d61568f4a413d