Merge QP1A.190107.001

Change-Id: I13b9bb250576909b5fb332ee89ad7b40b4a6e4f9