Change-Id: Ie416e122dffb666d90f6f254ed1ef5c31cd2b441
Fixes this up to be used with puppet. DO NOT MERGE UNTIL SWITCHING TO PUPPET! Change-Id: I845726a6496660da90e3af03c5caf559f24e53a7