Merge QP1A.190228.005

Change-Id: I89e885ae263b92c38069b9ab234cfa7958a0e011