am d259ee16: am 3d9abc2a: merge in release branch changes (no-op).

* commit 'd259ee16af9d585288e363672d8dcfeb1a86ac13':
  Fix NPE in CallDetailActivity