Merge QP1A.190122.001

Change-Id: I29b9f6b09f74cf2e33306d7736da627dc2eb4e43