Merge QP1A.190404.001

Change-Id: Icf8320066fd663f7a8cdc8b4ab7cb821c0d08ae1