am 5e4df66f: Merge "Removing implementation of unnecessary APIs taken out of...
am 5e4df66f: Merge "Removing implementation of unnecessary APIs taken out of the support lib." into jb-dev
* commit '5e4df66f':
Removing implementation of unnecessary APIs taken out of the support lib.