Merge QP1A.190107.001

Change-Id: Ifa62df87214667a129b556b8c76646c169d1ec78