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

Change-Id: Idb790ad32a714f9726469e33463b8b4bb83fd0f2