Merge QP1A.190228.005

Change-Id: I22ea46419b7a65c0b90bb5c43031212a8a4c636f