Merge QP1A.180823.001

Change-Id: I5aebb21577000a02a31a56b9f0f421ee2748370e