Merge changes If8c8d1f3,I3a804a9f am: 1fcefb0285

Change-Id: I6139500edf9c93d2995b822b19e9e9aaf3beaa7c