Guard against multiple inclusion

Change-Id: Icb9398f8405548791c43e5ffd083a12cdca2847f
Merge "Guard against multiple inclusion"