Merge QP1A.190205.002

Change-Id: I611751fad63cfb4276a0d6e8a537fd214f4f84c5