Fix a typo and change elsif to else

Closes-bug: 1380999

Change-Id: I8d2013fc33e072ee5bdf18447c38cbce1f2230cd
Merge "Fix a typo and change elsif to else"