Merge QP1A.190228.005

Change-Id: Ied7de7ce552b29e78c955ee7b05f94beab997c80