Merge 54a04b432d0d9eeacfc748bdd691e20ea3fe5d75 on remote branch

Change-Id: Ife67bde9820cb6a6486c01aad2b19658c09c76dc