Merge QP1A.190523.001

Change-Id: I1819902463825c96c9f5e14df46a90f9b193e4eb