Merge change 21242 into donut

* changes:
  Codename in minsdkversion for release platform shows 'null' in error string