Merge QP1A.190228.005

Change-Id: I5248b913cdfadbec430fd975953a2ecba2bcc572