[automerger skipped] Merge "Separate summary into DL and Ul" am: 591df852 am: dfd5cda5 -s ours
am: 36828b33 -s ours
am skip reason: change_id I654b670f553999f9fe8e036a6a88b891700def8e with SHA1 1cdd9598 is in history
Change-Id: Id22bdb0a222ebca6a066374a26d8f20346f1221a