Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am: f023f50787
am: 7ae53e7df7

Change-Id: I9f075fbb5abe2767db1cd743a8c828d6f77fb9de