Merge commit 'f3ba2e781228a16b255324c309fa7b514b25a7ff' into HEAD

Change-Id: Id1bcc51cecf5039cea4128c7cfcbf18090348ee9