Merge "Switch cast over to support library dialog" into oc-dev
am: de8cd0e8f5

Change-Id: I997130142d426967d60e9c384056c3aba1ea5af5