Merge "Fix and suppress API lint warning" am: bba4e2721b
am: 276c583af6

Change-Id: I76bf47dcfe861787dff9ed3f4708e2e1723db04c