Merge a926a8ed5fba16923da22814f17d0eec4d589c7a on remote branch

Change-Id: I6b6b9153d30362c196f6566955fd66cc2688a04c