Merge "Merge "Several fixes for DownloadableFonts sample." into oc-dev am: 5c8a8f1ec0 am: 2eb7fc3e4d" into oc-dr1-dev-plus-aosp