Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev am: 681ff5c7d8
am: 300a24c282

Change-Id: I29988d21eaaf1b1e49d8f90be921b77b5f3a368d