Merge QP1A.190122.001

Change-Id: I5aa58b186ae601250da56daee830f429ec6dc080