Merge d4f92d0d289e9608f59c1a63b6b6c150643fa694 on remote branch

Change-Id: I42bb8a29d99c2dc3e03c5cd1cfe5e60a57cf236f