Merge QP1A.190228.005

Change-Id: I448393d87653cdfc23e2052c9e6c9262a58de506