Change-Id: Id4f9d51267626f8c11c253cdb224ab019ff40139 Test: External library. No tests. (cherry picked from commit d965b5bb)