Avoid decoding jobject under a kGenericBottomLock am: c5c5186959
am: 4396e06864

Change-Id: Iaca3d9da492e07cb88aa523947e79f4a44468d57