FRANDOM SUPPORT

Change-Id: I83b49da0ac68140cb149ee904048b1016cd04427