Merge "Add missing else statement" into nyc-dev
am: 622c5b563e

* commit '622c5b563e1f2e7a78e64129f350387613161153':
  Add missing else statement

Change-Id: I0e6e13bf0bbd368375bd924c496d1b8e011cbf19