Bug: 22007124 Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321 Signed-off-by: Sasha Levitskiy <sanek@google.com>