d04ad541de
...retained with compatibility library Yikes, and also in the main platform...! :( Change-Id: I76ee3a9a5ba4a220c2f54d0af9cf49e3a736e7bd