Merge QP1A.180918.001

Change-Id: Ieea04b9a6126cd3198ee79755a8ebe2a43055a59