Bug: 18143314 (cherry picked from commit a6b2affa) Change-Id: Iac6d03d81997911f6707340487a26ee26a3aee27