Merge "Merge commit 'android-cts-4.1_r1' into HEAD" into jb