Merge "API review: make exception class and Builder final" into rvc-dev am: 9c9366b2df

Change-Id: I520c6df0ed11e24dfbb6e5c394d68e7761d515f2