(cherry picked from commit d0be7c8f9a06b3ca8ea7647ea35c8f9dc63f0fe1) Bug: 10239370 Change-Id: I0087e85a94d83b6ce68ec6a0768c44cbe4bd0132