am c865441b: am 46c552a4: am f196c40f: am 784303c2: am 5d962bb6: Merge "Fixed apparent copy/paste mistake Bug: 11634373"

* commit 'c865441b901100101bcc494965645680bfdf5949':