Merge changes I4bdadacc,Ie1f8da1a
am: add7d14341

Change-Id: I914a9786dc62d06393645130e63b94f85221ba97