Merge QP1A.190219.001

Change-Id: I08f0e88467ea46f2a02640ef1d15f42d132e837e