Avoid decoding jobject under a kGenericBottomLock
am: c5c5186959

Change-Id: Ic43f2fdd4ae4cf1cca88abadbd0f37c0da4b8cb4