Merge QP1A.190324.001

Change-Id: If8ddaaba470d70482ca0b5d353da4438d8efe75a