Merge NoSuchProviderException from expected_upstream branch

Trivial javadoc change

Bug: 111603149
Test: n/a
Change-Id: I5e22411bc038250d836a11e4ec0a1daa326b0d91