Test: atest Fixes: 128834143 Change-Id: Ib85271385a1385415a00d32ed6fd41fbc7b4f245 (cherry picked from commit c4c6e9fc)