This is more efficient when there are no changes. Change-Id: I50ef8ea28e7d83e2788e1ceaee93c97765031a15