Merge \"Don\'t reference variables before they are assigned.\" into nyc-dev
am: 2d5c95f5b9

Change-Id: I18651fef3ca880ee287d89f0ab4ba80f94f1dced