Merge QP1A.190228.005

Change-Id: I520407666389bdc66530615e41d44127672dff07