Bug: 7626586 Change-Id: I37730470dc09b7a9d6336b1603f87efd98f45e97 Signed-off-by: Iliyan Malchev <malchev@google.com>