Merge 08f8291717009ec6b44bebbccac2949f9e27f10b on remote branch

Change-Id: Ibf63103807c71cefbf7dcab2791654461a38a6d8