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

Change-Id: Ibb1bf33927f8ed452250e3a91ed77c60ca18da09