Updates to all resource types should now be functional. Change-Id: I9057ebd4ebffdeeb70c0c9b962c49b3dcb68d8f4
Change-Id: I61249dc1d9d70b35255a1cad7080cba306a85d42