Merge QP1A.190228.005

Change-Id: I0fcd3e4fa91f9d8c393f808171b3d03f648fced7