Merge "Remove the backwards compatibility support for misc_info.txt." am: 042d5a846f
am: ba765d7c47

Change-Id: Ibfefb981ccc25a28525e0c9569270c50b15a52a6