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