Bug: N/A Test: ran tests CRs-Fixed: 2328588 Change-Id: I4a7a6e1c0d8b23741b4e9a15b181a430af47d8f5 (cherry picked from commit bc46fb86)