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

Change-Id: If7f5f0ca43373d0895e5845c4556ab9b9cdd788c