Merge commit '19a49586eec957b3e0402d5360d6fea35dbca0db' into HEAD

Change-Id: I0d8fcdcd4f2857b701de553b4846776929262636