Merge 07201315dd1e895d9726197110644bd7b987c37a on remote branch

Change-Id: If66d37025d892288e7242af986ae601c27514bb1