Merge QP1A.181022.001

Change-Id: Ifda21e9d3006801ab235b17145f17db12437cc63