Merge remote-tracking branch 'origin' into meisiyu. update local code.

Change-Id: I4c11677a6da28c9c911474b3812f39a29157e1e6