* upstream svn@323906 Test: git diff f26c8d18 == git diff 05ba3281 c9dec135 Change-Id: If992e433888af8b631b54abd4dc81258d9462e89
mentioned in commit 77f176fe