Merge "libutils: flattenable deprecation comment" am: 6c1668d660 am: ae1f84cecb am: ce3f9a4405
am: 7d471cddee

Change-Id: I9c432542fd3f8bba5ce0940e755a0c3b86df85e0