Bug: 16386215 Change-Id: I0d0ae0113a3a00013ce84a1f5a110e2c52f19b86 (cherry picked from commit 6b28a456)