Merge "Fix newline symbols in files added in aosp/1183241"
am: f6cd76eef9

Change-Id: I033b07033a63b60d0a18ce8cfbdc661db24dd722