Merge b2e7bd3e5eb9cff5fea80fa3f4c1733bae0c5587 on remote branch

Change-Id: I17c5342378d1211e74eaba777a666e37c8eb4afc