Merge QP1A.190228.005

Change-Id: I466799ee59ff3ea1e0d85b2f4e09aaf889a1cadf