Merge commit 'eaf99a4e2009b0e5759e6070ad1760ac1dd75461' into HEAD

Test: treehugger
Change-Id: Ic3f7f76327e42a912d85f76bf579a631e1d76853