Merge QP1A.180823.001

Change-Id: Icc1da2e1176dce81a31de9284d4024cfbc9eeb05