Merge QP1A.190228.005

Change-Id: Ifdd3a6e7924fc1271e0397a3c4935c2ea319349b