am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev

* commit '10a54a7989a03eb0fdee7641c5795ac85b57e0dc':
  Remove dependency upon FragmentActivity