Amend: Issue #851 resubmitting after accepting ticket Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e Former-commit-id: af1332170e28aed53ff91997ce089b20423203d5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f