Only had to add a couple of newlines to the end of files. Change-Id: Ie7c31b3c9fc4ac00e8e3281888ab9faf84bc19c5