Merge "Merge \\"docs: Fixed logic for determining image sample size\\" into nyc-dev am: 025ad10a9b am: 45278444bf" into nyc-mr1-dev-plus-aosp