Merge QP1A.190228.005

Change-Id: Ia617df5d9185158045102603290f0ec0f6cc953f