Merge commit '2a8334bd8216d27c3eb141538cc57c06caa2c038' into HEAD

Change-Id: I7d91bc8df0ee0716eeffe0daaff755d85f8327ae