Fixes in Utils.java

Change-Id: I55a0c462fa2b55616903ca36fce86e2eddac2884