Merge QP1A.180918.001

Change-Id: I04ceb444aa320e5344832c1a76b37d5694c81ebd