Merge "RS API cleanup for SDK.  Update apps to final APIs. bug 3421901" into honeycomb