Merge QP1A.190122.001

Change-Id: Ic664de57fc90e65c2a9ba446ac08816b3fdc8989