Integrate duplicated NTT DOCOMO carrier labels

Integrate two separate NTT DOCOMO carrier labels into a single label.

before: http://imgur.com/2D3qjd1
after: http://imgur.com/YJh0gxq

Change-Id: I87c3dcad947cda779b3b4a4b2ffdc2a6f63dbe5c
fix typo for True-Move carrier

Change-Id: Id5b82060a8fae2180fb081adb7dce6c7bac4da63
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy