Fixed crash in the empty input test.

Also fixed style (indentation) in some classes.

Change-Id: I163842fe6f13885595f687307a3f7b77d883efa7
Merge topic 'fixed-empty-input-crash' into master

05ad8270 Fixed crash in the empty input test.