Merge QP1A.190228.005

Change-Id: I89242bde66685d7686cfdce70500465af0365de5