Consolidate differences with jb42 -- seems to be a noop in most cases

Change-Id: I05c3a75eb2168b5fbac32a8a39e40b52be08905c