Merge "Fixed minor issue in update script argument handling" am: 5db95509d2
am: 6f960b3c42

Change-Id: If507dd0f61137220df89053de8d54211070a69fd