Merge QP1A.180823.001

Change-Id: I33cf1cb1230225f168f412f25d124af157db5dc7