Merge "fix NPE when fragment container is null" into oc-dev
am: 38eae1bb15

Change-Id: I51b07b1e8f05410737205539be630a0c463ddd3a