No changes to the guideline except for numbering and covered releases. Change-Id: I36fc5164fa352ed606c5923f904599775700aa34