Merge QP1A.190228.005

Change-Id: Ic7995eeeb35412dabc6546fa61a997234ab676c5