Merge "Infrastructure for obsolete methods"
am: 0fd9a7d678

Change-Id: I1cf9630b5f5363334bc37e6f81b1dc733efa1c66