Merge "Converting empty graphic to vector drawable." into nyc-dev