Merge QP1A.190228.005

Change-Id: I1df3ddce7a808f4fcd0577a31d64b944897edb6f