Merge b0d132ccdeb402c25a304569acbf33c653ad522b on remote branch

Change-Id: I618b9c48c3fa4323b54804222c7fd3f7fc733545