bug: 20323084 (cherry picked from commit c0bf6a67) Change-Id: I8dfb6c8e8cae1a9eb7cc209390062ea84092a824