Merge QP1A.190122.001

Change-Id: I0f7f207ff10ca571e6f18c17369e0d2aff11183d