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

Change-Id: I80ddfeee21d3c34e334594d4493bebbc02250214