Merge 4448059bdebc461fc3104e1e05f202f230a5d4be on remote branch

Change-Id: Idcc5b1aa859070f634d4ae953696a7c9bf18146e