Merge changes I8b3e8a3b,I4976abef,I31dadb9c
am: a2fd28ee06

Change-Id: I9fd36550b5a03b7cbccd77d39f7facb877ec1426