changes from Florian

BUG=
R=floitsch@google.com

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