Merge commit 'b94ec526dc9909546fe74d0c2ce01cb3e0db2691' into HEAD
Change-Id: Ie51450fa35a6d87db0e270177ed153b67607b142