Merge QP1A.190228.005

Change-Id: Id031a4718b95201f083796dd0c18de83a2eb296c