Merge 42c20d1042a66738f57a2ffd8edad111afd811fa on remote branch

Change-Id: Id439d426d7452d1d0ee4d3ee8ced48edb85b378a