Merge "Add space in error message." am: 2bed78e95e am: be9cac59e9
am: 95344bc918

Change-Id: I78d5e0a61d862254d8326a042271aadc05e1f4d0