Tweaks for forward-compatibility

Change-Id: I9171f0f0155c910cf5ae4109e812c9ff10702946
2 files changed