Merge QP1A.190122.001

Change-Id: If78849649039961775e55c3a88b8e61f3ea39114