Merge "Modernize codebase by replacing NULL with nullptr" am: 35bb4618 am: b9b97393 am: 0ab2ef4d am: 5622b8b4 Change-Id: I6f56c21661e495bd250de28fc95157c28bf1dba0