Merge changes I3464fb56,I806be1c2

* changes:
  Add utility used to style content with learn more links
  Remove deprecated android.graphics.Canvas APIs