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

Change-Id: I93b731cd4a52828e1c3d00018d4c095ab0e508a3