Merge "Add ResourceId validation helper method" into oc-dev am: 24c18af14a
am: 01b95f9067

Change-Id: I7097af67601496f56741a5f5e43f953ba8134ce0