Merge QP1A.190228.005

Change-Id: I51745da4a5682f9169a66407668534506354a79c