Merge "Allow update_engine to get gsid property"