Merge "Remove extra space." am: 3a9680bd44 am: 958be72e31
am: 5f6471ea6b

Change-Id: I1e894c0e3c06b8886bb9d91256c674d5ec8e4d98