Merge changes I1d398d19,I8f20b3cd
am: 563db92a44

Change-Id: I9a22ba63f4306c17933624f4c99380702f6e701e