Merge QP1A.190404.001

Change-Id: If7f168c5ab669c167e0274f2f62c320bf01d4ac3