Merge changes I8ef4492b,I3c61421d
am: e16ed6da59

Change-Id: I1f5c80b54c6f470b6bcc6a917b28763286edbdb6