Enforcing consistent closure format ( M, $ )

Change-Id: I5125c2dc048a25b7ea1ddf8667ffc38647b926db
Merge "Enforcing consistent closure format ( M, $ )"