Merge QP1A.190408.001

Change-Id: I8003f6cd94d97e038767af9b53cf04417f561c1d