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

Change-Id: Ic406dd8777ea947a1c76ec5b9067b61c4a126543