Merge QP1A.190228.005

Change-Id: I47b17a6fa7210d484927f67cd4d8e1c51799619f