Merge dad3faaf2c95c14574b86f5cce64c20bab19b05b on remote branch

Change-Id: Ia31ac76f3e0e3cf86d42ecde34d65297b4990b7b