Merge QP1A.190107.001

Change-Id: Ic6af5964ceb10066bd790bc77fb075c49c60dc56