Forward compatibility patch.

Change-Id: I8e8af0c6035aaac5e5097f1cfb198250475627ee
2 files changed