Merge "Clean up some resources and change switch-case to if-else block."
am: 7d1842859c

Change-Id: I96976105b2d286eb39d4a286fbd584b39909313e