Merge QP1A.190122.001

Change-Id: Ie972151fb2d00fbea521a51982670409a32f9b4d