We now do this on the ResourceMenuController side. Change-Id: Ic249b6a687fe059393ccf55bbc4534242c08e30e