Merge QP1A.190228.005

Change-Id: I0baddb00b0db5c3dc2ae4557153a716a60487d72