Merge QP1A.190122.001

Change-Id: I003da85a522b866306b613ff9250c1e0f8469ac2