roomservice.py : Trianglized 

Please cherry-pick this commit when resetting android_build