Merge QP1A.190404.001

Change-Id: Idce880bad7db38e729964ebb264e1427076ef572