v6: copy in from v5

Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7bbb255988e9f005484e3d1edd31c3d9a81e7a5f
2 files changed