Merge changes from topic "hidden-files" into rvc-dev am: 8de1632699 am: fa0a3635da

Change-Id: Ib27c560ae16077bbf6ed2570ab8f3fa699386066