Merge QP1A.190228.005

Change-Id: I01d80d1080496c2ef3caf62a9766fdf68a9c64a4