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

Change-Id: Idbe31bff6ed2c918a30f74d18f7560187b01104a