Merge QP1A.190107.001

Change-Id: If019c75ac81f35d72fc2aab573557e325e2dfcb0