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

Change-Id: I737474738fa688d5bc651390409cbd792ffa7282