Merge branch 'master' into wyh

Change-Id: I255254034a1447c0130fbbd52992cc1e02886798