Merge QP1A.190122.001

Change-Id: I77783acf5df7787566a6e94bad65e9907bb13966