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

Change-Id: I61d552561842f6b4f27d19c0f3924aab5b8f41c8