Creating Folsom branch.
Syntax cleanup.

Change-Id: I04ce4a89d53907867bb3ad1523856670744df0df
Adding Grizzly compatibility.

Change-Id: I529b0b05d3c2396c474c63b05001180a8c2e71ea