JSHint: missing curly braces

Change-Id: I21a8229349f5a91f47816ebf8a8515483fa69a63
Merge "JSHint: missing curly braces"