Merge QP1A.190228.005

Change-Id: I654d0e1b3c89c54686d44c2e8376ea61f20717ac