Merge "Remove a test for backwards compatibility we no longer support." am: 293d4633 am: 72aa74c6 am: c444914e Change-Id: I91b8aa2688fde298ced48c48abffdc027b075f01