Android O IOT Preview 7 (4635859)
Merge "Add metadata to config_gen"