b94b6e0d3c
Bug: 175329686 Change-Id: I48e3f6a20c27c8c7aeef5da7a464a6c4a5e4180c Test: create folder / add items to folder Merged-In: Iaab592410734b0b5239dbbddbb9b2ed5a9f5d8b0