Merge changes If35518c0,I04bede0b
am: bda0a3e637

Change-Id: I9561d358eb5e43b68011758009ae9bfcc19f5624