Merge "Support header versioning in dm-bow" am: 96336c716b am: 06181f3605
am: 96bdc38fb7

Change-Id: I76f8e0b5d231f1ca103efcefc1800dabdddc5fa0