Merge "Removing unnecessary proguard flag for removed info view."