Merge QP1A.190122.001

Change-Id: I7fcbb4d173dcdc3fd63b2fcb78d8ac14b8a8555f