Merge QP1A.190228.005

Change-Id: I7eff22df11978b2e3579f6d5564221450fa508a4