Merge QP1A.190324.001

Change-Id: Ia944ce99ca1ee2e9d320af3cce7858aa0df69ae1