Merge QP1A.190228.005

Change-Id: If272cda7327834f7c0920dc4ce3ec46102fc4a55