am 39b19119: am 39a04d57: Merge "Remove extraneous semicolon from namespace-closing curly brace; was breaking some builds."

* commit '39b19119e9a33ec6ff7966a981aa41372a17b197':