Merge QP1A.190122.001

Change-Id: I5e84813978ba27ef7a87d18df5730c92bf9641ff