Merge commit 'a9345b686dbbfa927a51598ec7582cf61e35ef55' into HEAD
Change-Id: I29d86f8ceb27d2c190c13b500088a36cfb6b552d