Eleven: cleanup findById usages

Change-Id: Ie46ae48c40042c48a702b797b0836eebaaad344e
16 files changed