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

Change-Id: Ie497c5446752410af84745c0f9a93cc60f26fc4c