Merge "Disable font test temporarily" into oc-dev
am: 152f6c8e04

Change-Id: I548bee7f45bfc7f364327233c4b4e1faf75139a1