jira: 7686 Change-Id: Ic95d0789582e0a9dbb0edc2421ee076fdadb3572 (cherry picked from commit a174000ec18dae27d37976bdef6810914ba5f0ee)
jira: 7686 Change-Id: Ic95d0789582e0a9dbb0edc2421ee076fdadb3572 (cherry picked from commit a174000ec18dae27d37976bdef6810914ba5f0ee)