Merge "Set correct bounds when offset and expanded" into rvc-dev am: 44cb762e2b am: 9eba405eb9

Change-Id: I4ab2396c845e340c924bdd32e5fe047d8882a574