Merge "Disable font test temporarily" into oc-dev am: 152f6c8e04
am: 38b3c15d4a  -s ours

Change-Id: I44f124baf18c9a39e76e7407e17397da7c038d67