Merge db82b08ff00501dce2d34a6c7cfa4495770da6d5 on remote branch

Change-Id: I65929038bcff497c2c8cd2a5af2d93ba5f706d51