1447c8327d
Signed-off-by: Elena Sakhnovitch
Change-Id: Ia7a6b17eb0f317465613ba92ae7548a221c46ee3
(cherry picked from commit 5e1bfcadd7)