Merge "Fix include guard."
am: e360d9516e

Change-Id: Ie498719e0419b748b99423e5161c6a60a25cd05d