am f08c2e18: am ff95897f: am d0b02b52: am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."

* commit 'f08c2e188d2123207f76b81af16078e9fe53bf51':