Merge changes I3c14cfcf,I9d2ea66c,I9930105e
am: 14540d9ceb

Change-Id: I5fb6d27b98e0308f181f5bd2be8f1af967d37e42