Merge "Issue #5689186: Add Guava as a dependency for NFCDemo sample" into ics-mr0