am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev

* commit 'a02bd53edefa6868829602675c068926ef270c63':
  NPE occured when trying to parcel voice features.