Optgroups added back to logs sources

Closes-Bug:#1383723

Change-Id: I58ad0e5ffdd80732b69d54d85e729de0d81c277a
Merge "Optgroups added back to logs sources"