Merge "Update preloaded drawables" into nyc-dev
am: ef817a1deb

* commit 'ef817a1debbad9aa3de5ff49765b9a9a72fc73a2':
  Update preloaded drawables

Change-Id: I9fd99afb7b18cbe589a0e97558132f1cdf21cb00