Merge QP1A.190107.001

Change-Id: If2112dc686f0f99ae50ccc62a1116270359426cc