Merge QP1A.190122.001

Change-Id: Ice9a85a6c3f28094458256ba53967e8a088c2743