Merge "Frameworks: Silently ignore InterruptedException" am: 7e717e09cd am: a6c6c4f5d3
am: d52c7c9206

Change-Id: Ia6588f13809132b705d372ba132ed3f7ef179bad