Merge QP1A.190228.005

Change-Id: Ide0be3c56f01d02ea735b3af485fff7b857fb6ec