Merge QP1A.190228.005

Change-Id: Idd1bb4741ae6e193eaafc2460f8212bb3475943d