Merge "pragma once for header file" am: 85f5a4449c am: 5310ca2aa6 am: e3011e03b8
am: 93150db6fd

Change-Id: I63b44567cdc2706e23186f2f3709f83b6d9068a0