Merge QP1A.181008.001

Change-Id: Ia8f1df5febd1d798182894822556e3c037ffd330