Merge b4fc0eb014d4052a050226cf304bdb026beb9ec6 on remote branch

Change-Id: I3337488f940ca91a62690b1c0a635670926f6775