We have this now. Test: ./run_tests.py Bug: None Change-Id: Ib8df5d073c74eb66eb614650d06d2e51117acef6