Merge ed55aa5a619eb66b72badeccf9c72e3400acda71 on remote branch

Change-Id: I47fc3832bb8ef101d138685cea99b766fecd1916