Merge "Fix NPE in ActivityThread" into oc-mr1-dev
am: 348b13f597

Change-Id: I4ac05199b93902bb19fd6eb42563e9c4fa00ed6c