Merge QP1A.190228.005

Change-Id: I11f6e4aef67054177e2c1a89aff19d7b7703dfc0