Merge QP1A.190228.005

Change-Id: I9babded374bbce02b944583b38259bd166bd618f