Merge "Working around bugreport crash issues" into oc-dev
am: 5176a4cda3

Change-Id: Id5f50a4fad73b51079685b86839ccbe9912c2148