Merge branch 'lzq'

Change-Id: Ibdacd10cf452482f0c6712da971fcce55cee00b8