am defb2dfa: am 3ce2454c: (-s ours) Merge "Revert "Temporarily disable due to...
am defb2dfa: am 3ce2454c: (-s ours) Merge "Revert "Temporarily disable due to python-related build issues""
* commit 'defb2dfa':
Revert "Temporarily disable due to python-related build issues"