Merge "Fix include guard." am: e360d9516e am: 5b9554ace2
am: 994dd0e96b

Change-Id: I44c7df1b1801e8e606428880d3084b3df8ffb592