Merge changes I0ff0c4f4,I6bdfa2f5
am: a63eab4f6c

Change-Id: I77d7836fdc5248b4db4cf9f11b5ce62a8046e713