Tweaks for forward compatibility

Change-Id: Id6a96521b3fd5bd2a034fe89cfa4d3a179a66328
2 files changed