Merge "Fixed minor issue in update script argument handling" am: 5db95509d2 am: 6f960b3c42 am: 2cd1557b99 Change-Id: I772ca6290af29a7a06653f7bbf812e6c6508175e