Merge "Fix back button on fragments without help uris" into nyc-dev
am: ed74511

* commit 'ed74511cb170f499e3c776208471b9ff3fbc762b':
  Fix back button on fragments without help uris

Change-Id: I327abac867272c5900603d71d6e7ed4370dc0c48