Merge commit 'cdaf748e3abefd93a4e45393e96717fad8564c51'

Change-Id: I3c44564b08ed46f46719dbca54d4225718bb8c59