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

Change-Id: I9a9b76423c4ad531013b4a7c6f7c98c7b47b0a63