Signed-off-by: Mike Chan <mike@android.com> (cherry picked from commit 97a0a74383d19a1a43ffca81271894ba3edc07b6)