Merge QP1A.181008.001

Change-Id: Iddcf7c5fa43ef6da688345fdc7b9ef41c5013e56