Merge QP1A.180823.001

Change-Id: I4def5b8acc18454770ed7328f0f916f415c4feec