Helper utilities

Change-Id: Ia689302fc1bcc3b11dceb51f131cdd4ac1ad30ba