Merge "Make LinkPropertiesTest backwards compatible" am: 9b6ddfb5 am: 2a22fe99 am: 64c988eb am: 7935eb33 am: fb4714f3 Change-Id: I61db756128dede848a699f7af5ab535e98993603