Merge QP1A.181011.003

Change-Id: Ie765b172a462eb9a5a24ce6bf38d377bc747bcc9