Merge QP1A.190228.005

Change-Id: Icc4eca2a97ebad9df9a4016ad4f9216f04c8ca7e