Merge QP1A.180918.001

Change-Id: I05edc28f1c9861670a9de29a272cfa383119be86