Merge QP1A.190523.001

Change-Id: Ice508f104f1b0f275a74c57eb86c480c6ad29474