Merge QP1A.190228.005

Change-Id: I911a8d127f7ef80590e9e4ea230f30ca5f0fb584