Fixes: 139111963 Test: atest Change-Id: I0f0d442e9f5cc5bb1d73a638e00726807ef9fb48 (cherry picked from commit c29370a2)