Merge "Return the right thing from Context.getApplicationContext()"