Merge "Fix ANR & Crash on Ryu" into oc-dev
am: 6890dc95d0

Change-Id: I5f0a2fc7ab40b702e3e81ceb3bebd8ef44d22298