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

Change-Id: Id50ed2787fee5e7801e6f2bc239232e1c551198b