Merge QP1A.190228.005

Change-Id: I59a33f2e4d05f90a77771a499e4fefe06e84cb6e