Merge QP1A.190122.001

Change-Id: I6176a5881af1002ac6edda6edc5263f6365c2684