Bug: Issue 6179 Change-Id: I436b6dbd88e83b4d901d5446a0c7900678be157d
This change depends on API implemented in Change 105052. Feature: Issue 4644 Change-Id: I91137aaa69eef419e08c8a568cef9350d8a1448b