Merge changes I0940d13e,I38f2d013
am: b42e558b5a

Change-Id: I86eac53776180c14a72389dee88238c2bd489269