Merge c0246855e1769b80222144c25f57da6fa7b07a71 on remote branch

Change-Id: I5ce6e616372a7d290e269f35d324e3539f060e61