Merge "Fix support for @empty in style resolution" into oc-dev am: 7d75f49175
am: 0532e76302

Change-Id: I0c5ed6e6d149982e98578a02a7afbaa7d6cdfa6c