We currently have a pending conflict over the Sphinx version in g-r, so sync with g-r manually. Overall I would suggest that this project should follow g-r Change-Id: I0bf1af38945ba3e52098a925ea31f6f1dc3f3fbd
Change-Id: I28402285aaeecd4eb85415a39763b2798fcfa33c