update for m3

BUG=

Review URL: https://chromiumcodereview.appspot.com//12328022
Merge remote branch 'upstream/master'
apply m3 related changes