Change-Id: If11f3aec70ba2ac816b9b824a387ffdd2e51790f
This makes internal code consistent with the API and user interface.