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

Change-Id: I90a99274e996daf4d6e870e73fbd5566f03cebf9