Bug: 67506682 Change-Id: I8476680bbeb88ddaec2219bc6accc963a2688145 Signed-off-by: Sami Tolvanen <samitolvanen@google.com> (cherry picked from commit d93a963d439b4ffc3d4b0e934fd5560470f12504) Signed-off-by: Dan Aloni <daloni@magicleap.com> Signed-off-by: Davide Garberi <dade.garberi@gmail.com>