M2 -> M3

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