Merge QP1A.190228.005

Change-Id: I46395517a4fc501c7de25f1565c0469b31f7f3e2