Merge QP1A.180823.001

Change-Id: Iba0db2bcf3b5139171aa4d8216ad63120815c53a