Cherrypick so we can publish N version code description ASAP am: 491bc2b8d6
am: bae14052a0 -s ours
Change-Id: I48e9ceff6226b222c1fe83bdc670edfeea0dfa7d
This commit is contained in:
491bc2b8d6
am: bae14052a0 -s ours
Change-Id: I48e9ceff6226b222c1fe83bdc670edfeea0dfa7d