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

Change-Id: Ifc24e161ccf3564bf94c695053d51cbb600dd963