[automerger skipped] Fix API lint copy command am: 18a28956 am: 3ede8f14 -s ours am: 86b7886e -s ours
am skip reason: Change-Id I42b8b60d01dcaed34dbde0390eb1691d656a32cf with SHA-1 3361a294 is in history
Change-Id: Id5c024e513bb04c74f72d0a2fb8888df8f37bd3b