Merge QP1A.190122.001

Change-Id: Iaf270a4b0534c83ac582d89aa2e140f4b8cbc7dc