Merge QP1A.190122.001

Change-Id: Ief213a5e49d65c9d6b5addf3f9c0d61c531129ec