Merge QP1A.190219.001

Change-Id: Ifa9bdaf4586a9d19e1d3188005b648d5c86ae3bb