Merge QP1A.190122.001

Change-Id: Ie4e27fc8dcdb2106bceaf86c77ac7459b0e0a5d6