[automerger skipped] Merge "Clean up some resources and change switch-case to if-else block." am: 7d1842859c am: be6eb29828
am: c3c8206a86 -s ours
am skip reason: change_id I8f81195b72c6329844a450ce28d76f949f41e2d8 with SHA1 28a499cd71 is in history

Change-Id: I04636ad3ddccaed698c3247dc1ff3a3d0eb1b5e5