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