Merge QP1A.180823.001

Change-Id: I7fe9192307571f22b74165b5b1860119a4cb4e33