am acf3a796: am 46ab4ddd: am 3eb44e34: Merge "Delete ContentHandlerFactoryTest." into lmp-sprout-dev

* commit 'acf3a796eb415c43765db231119561962019e11d':