Signed-off-by: Jiaming Xu <jiamingxu@google.com> address feedback remove empty spaces address feedbacks