Merge "Remove skips for VariableTableTest & VariableTableWithGenericTest" am: 2f1ca4c9 am: 04c1aa64 am: c8108c21 Change-Id: If238112c41147dc71ad8cbe4556e4e4c1860ac92