Merge b3e47e726cb42beb33f0352645bb75c7bf37d8dc on remote branch

Change-Id: I4f5c4772889ccdd21cad0c45b87b23f5b79144ce