edit function
Merge https://source.developers.google.com/p/indi-home