Merge "Remove "required:""
am: 95e8de2576

Change-Id: Ifb33092b1743d9a8c5d764e27b9788db8b5c0af9