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

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