1. Have a better indent in doc/source/conf.py 2. Fix an import issue Change-Id: I5811c195157706d2a85c0fd47666e67f94b2c558