Merge "Merge "Rename \'thousands of an inch\' to \'thousandths of an inch\'in the docs." into nyc-dev am: 10a1a656e2 am: 6096c68863" into nyc-mr1-dev-plus-aosp