Merge QP1A.190324.001

Change-Id: Id3a85eb800d48d6436ad2c0ed9aa9690a594cb26