Merge CM upstream translation

Change-Id: Ic1b48b39f18ee60aa4cc3c5d665cc77332c12450