Merge "Fix issue where icon was not centered properly." into cw-f-dev
am: 6119c54b48

Change-Id: I112e499a1e12c62c63b6d6c9c4a3861e4e859e25