Merge "Don't throw exception for inflation after removal" into rvc-dev am: ae72005349

Change-Id: Ifd7aecc03d8c2bebeae27358204bd3132a7ec763