Merge QP1A.181008.001

Change-Id: Ib06eef8e70062db45d8e8faa9b69fdd80a54aee2