Bug: 15189630 Change-Id: I4644ec782e636104fc06a27716f2fd224003e8d2 (cherry picked from commit 0a03a2ab50b665d382f92a1219177c3bd6fc568b)