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

Change-Id: Ide54d57abafdf2664251b829597b102dbaf53e77