Merge "Support for API cleanups." am: eeb095aa02

Change-Id: I1241ed5f20896e7d2758dc6627a13c8cd9114091