Merge QP1A.190122.001

Change-Id: Iff400f59f9c74c94b82974dc50b680b79dc1fd3e