Merge commit '3bdea5973f7d011ba9637614bb8eaddee7f7bbbe' into HEAD

Change-Id: I9c98159e8f1b94e3e617cd6533469fe082511975