Merge "DO NOT MERGE:  Restore UiThread annotation" into nougat-cts-dev