Test: Manual Bug:116641110 Change-Id: I1611a63dd1a7603395d2cf12130920515ccaf6aa Merged-In: I1611a63dd1a7603395d2cf12130920515ccaf6aa (cherry picked from commit d74a1da9)