Merge "Add @NonNull annotation to CONTENT_URI" am: 24eac6a4c7
am: 2772d55ac5

Change-Id: I534c4de1f74c35e41f96555f4d0b1d46aa452537