Merge QP1A.190122.001

Change-Id: Ie18031b9f0d9a5f4b123193d8f8023c0c41988ce