Merge "Fix Os.getDefault() BlockGuard test."
am: 4be8b6e701

Change-Id: Ic07b1d767755fad419017fd298452e5f26d2ecd4