9c7096c8ac
Revert^2 "Fixing AdapterItem import" 1a27c278d6c6594b552b620b4d2b67e68bef23f2 Change-Id: Ia3bf9f0b3aaff0d1e2d102320e917462b38935b2