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

Change-Id: I0888cc3e628cd004887ecf0cac5fa718dc1d0f15