Merge commit '5276cccb' into gingerbread-plus-aosp * commit '5276cccb': Verify method invocation type.