Merge QP1A.190122.001

Change-Id: Ib02c3b526a3ec0753df8d1cd201a062b118fa5be