Merge branch 'master' into muzhi

Change-Id: I7cddae202f53bf983a06068a92c3c343d8ab05db