Merge "Support for API cleanups." am: eeb095aa02 am: 4324282bf5

Change-Id: I9cc8c722970357d3195441463d5e52da322a6082