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

Change-Id: I669775f4f1ee195a9f3e4d709135d8c87252e30c