r=self adding bookconversion and encryption changes

Adding content from Manoj's repo to rahuls