Merge "Read and write constraints for clinit"
am: d90231a8fb

Change-Id: I0cc0c993688b306bfc01ee9bf7fad2133ec8f5b7