Merge QP1A.190701.001

Change-Id: Ib0dcf10a0fad528a76352071078a8473b2cd4060