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

Change-Id: I6850c9c0b883d3f3c3937e264234e8b6aa781044