Update B3 SVN to 9 Bug: 232157623 Change-Id: I3831818311cba211a3e3899ef0bd163731264055 (cherry picked from commit 0509973a7de00a133970b07b1706090685d4a960) Merged-In: I3831818311cba211a3e3899ef0bd163731264055