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

Change-Id: I6f6c469f912347f2587bbb09409e79621150b8d4