Merge QP1A.190205.002

Change-Id: Ie066932619adbfb7c88439387298fddc9eca0628