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

Change-Id: Ifed9a816edf6bdc29ef04de83633e5a0d4e75670