Merge "Fix transition return issues when more than 1 level depth" into rvc-dev am: 9aa88525 am: cd991f9b Change-Id: I078f9e9d7644333ba05aa9a68ec2d90bd9e26f6d