Merge QP1A.190122.001

Change-Id: If06d9d062b506fda28dd8d5c6bb4c8ea313c53bc