am dead26b7: am 950297d2: (-s ours) am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev

* commit 'dead26b73f1d2f6405bfea6a1f7464df55d5d157':