b/23238405 b/23793209 Change-Id: I62d1a167eebfb266e846b1de7f23873f1dfdab56 (cherry picked from commit 5859ae22)