Merge QP1A.190228.005

Change-Id: Ia85eddfeca8a90b2ffa43d3d0a6ba9a9b8a7875a