Not only were needed methods added to the proguard.flags file, but, the file was generally cleaned up so that only the methods absolutely required by the unit tests are specified. Change-Id: If888d69325c3138815e39218d05eec473d5d72b6