Merge changes I56d4f852,I8c81dc1f
am: ce79190156

Change-Id: I67660255114b3576a4d34a2e32d407349eea95f1