Merge QP1A.190228.005

Change-Id: Iaa1c88cb529e846b2dc5e1b294c6fb2da9492312