93d878f49e
Test: make Bug: 111475013, 117228643 Change-Id: Id649a1ed2109dee87bb8c61c3a161efe99c5e457 Merged-In: Id649a1ed2109dee87bb8c61c3a161efe99c5e457 (cherry picked from commit cfd2692a94503753bf9abcffdb40ed2de682dd41)