Merge QP1A.190613.002

Change-Id: I5e208f5c76399fecde4799dcadff7aea4ce34ede