Merge "lshal: remove "// static" comments" am: 8d2f788a05
am: 7d6944d40a

Change-Id: I36367aa4f5bd756d31855186066cd2e930e32414