Bug: 405670 Change-Id: Iee51790de4450c823e3ce773360dc92bd0189c6b Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>