Merge QP1A.190219.001

Change-Id: I47b129c8a1165234334bb26328e480f7a5b94fdb