Merge QP1A.180823.001

Change-Id: Ic8e064217988592c314b276ae6f4ef509a831b3d