Merge "Update more implementations of findViewById()" into oc-dev am: b7f0db8d89
am: 2de6b0dab0

Change-Id: I03772206b8849237e1138303229c6ed1c3c2b432