Merge QP1A.190122.001

Change-Id: I6f7d6b9e21419f8be6882dbd738a232846f1623e