Merge "Add old APIs as overloaded methods"
am: 542e4e6b3c

Change-Id: Ifb50ba9de7ab8aa2ce24ae35215d60c6a0461ee4