tweaks for forward compatibility

Change-Id: Id9089424d82567556fc1faf6024cfe46b3de7cfe
Merge "tweaks for forward compatibility"