Merge QP1A.190228.005

Change-Id: I6b32c05cde03e95129f66db90de26f74e67e7965