Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e97969b4d0
am: 74bd9b1f56

Change-Id: I56b83ec38059af3d15d3ad123ebe96bf7330dbbe