Merge "Removing unnecessary asset." into oc-dev
am: 45eed80587

Change-Id: I52336e75ff507b186ba74b4e5b25ac796fe6dd07