Merge QP1A.190219.001

Change-Id: Iea2ab603b5eabcd9aaa1a3e94c8f11f96efa3748