Merge 00e0d5e22a83a7dbcc8ddeebd2cc85469307491e on remote branch

Change-Id: I8b60e5c315ddedc6a07c702b9b6b0e245ad46259