Merge changes from topic "vab-block-map" am: 5eb9aa7828 am: 5fef5f0256

Change-Id: Ic2e15a037846354cda129294d5459ec2d0e69a53