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

Change-Id: Icc26dab845ded7813abea322dd3898364a96f4c3