Merge branch 'master' into muzhi

Change-Id: I43d45d4fa806ae88d6a5485c07e85ceb185012ef