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

Change-Id: I47b6970c6e5fd503226e9ec1fb54ebddbfae6150