Merge "Fixed bug in handling of OTHER as terminal" into oc-mr1-dev
am: e95197a664

Change-Id: Ic48503564647c588d076f7ceefeeef38dcf3ae6c