Merge QP1A.190212.003

Change-Id: Ibf7da75368bcf0f6a96e0356415583dfcd059e5d