This removes unnecessary changes from build to build. Bug: 24204119 Change-Id: Ie06330f196a64509fc066b329b6e383f02a6db4b (cherry picked from commit 89fff63d)