merge with apexq

Change-Id: I5be9400a7935aa277602e83dd28d38d4383feca7