Merge "Remove redundant @TargetApi, @RequiresApi and @SuppressWarnings" am: ef058068d0
am: 128ede2a63

Change-Id: Iba818d48237eaad7679fd206e98d56114bca27bd