Merge QP1A.180823.001

Change-Id: I5757e4de4d821096af4f3f3fa676a8d96bd7fde7