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

* commit '950297d27fcabe22b7c9fbbfa28ef8b9a350ae37':