Merge "Increase default size of hnvram partition to 2M"