Merge QP1A.180823.001

Change-Id: Ie0ce2a4867b4459fbac441343b3a067e5229f75c