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

Change-Id: I5958502881429ba1e1ef65247eabf97376d2f7f5