Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev