Merge "Create dummy hidden api files for golem." am: e53f308e54 am: 6fd766c307
am: 264de77247

Change-Id: Idfa36bc18480fda10c3cf3825ec9c63189698722