Merge "Add checks when retrieving data for the JNI layer for AVRCP"