Merge "libutils: flattenable deprecation comment" am: 6c1668d660
am: ae1f84cecb

Change-Id: Ic1db0584da05c8f083b651f24f906000ae3501b2