Merge QP1A.180918.001

Change-Id: Iaa537336dca514b2a66e26b7be62139b75c72e55