(cherry-picked from commit aa6c3c3e25) Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
aa6c3c3e25