Merge df5308939a391f7ac7de77f056247334b102399e on remote branch

Change-Id: I3c56de22e2fc5b29494be2f61125caa93bb16453