Integrated CL suggestions from previous CL

BUG=

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