[automerger skipped] Merge "Explicitly specify the name source" am: 8db85cb0
am: c3915ae1 -s ours
am skip reason: change_id I249b04cdedba3126a1f8574bef5bb538fda34a5a with SHA1 24eb1874 is in history
Change-Id: If28a156df02fb17c70dc1b8b654f357c4d591632