Merge "API: Make implicit APIs from type usage explicit"
am: 6fc3189e37

Change-Id: I729f819566c6d477d5a557018a3f0ae39e0525de