Merge QP1A.190228.005

Change-Id: Ib1ca0a5a64e5fe30642c11a3831fc22a427e3a31