BUG:148403740 TEST: m messaging Merged-In: I4b74a267c0ed7cffe04d97ca465f2aa90ae1847a Change-Id: Ie6f26f2a9e207adeee475e347f17dd8e0da78d9b Auto-generated-cl: translation import (cherry picked from commit 3bd7b79daa)
3bd7b79daa
Bug: 26496609 Test: none Change-Id: I78092318110a6916e07a5213e3584bf04ddd954c