Merge commit '5e7b7cd65bea53357ecad68a31a52883897c824b' into gingerbread-plus-aosp * commit '5e7b7cd65bea53357ecad68a31a52883897c824b': range checking for tnf