more updates for m3

BUG=

Review URL: https://chromiumcodereview.appspot.com//12320061