Tweaks for forward-compatibility

Change-Id: I3c734d0f7961aada86977d3b7414ee489f3f6c05
4 files changed