Merge changes I8bf2248a,I17aaca24
am: 55f93af0fe

Change-Id: I3be08642b8cd2599bb9676059c98b12d77620d91