Merge changes If7fa11e7,I345c9a5d
am: a5a6c0a0bc

Change-Id: I9d8514ff1aefc0a7650e3e5b06021a127f5149c5