am 2c5951f9: am a2e312d8: Merge "Fix remaining file related CTS Test failures."

* commit '2c5951f9ddb1b520ab1d3131b96650eb57410e48':
  Fix remaining file related CTS Test failures.