Address comments directly in master, adjust for new sdk html fields.

R=jmesserly@google.com

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