Merge "Add runtime to unrestricted."
am: 637bd4d9bd

Change-Id: I9b9d9b15295b94689a39417d1204c4f50e6a4bc7